bitkeeper revision 1.1236.1.8 (421da0af_4ZHSxnqpym3nlttZ_d5fQ)

[PATCH] term.patch

Enable text and RFB interface in the device models

Signed-off-by: Arun Sharma <arun.sharma@intel.com>
===== gui/Makefile 1.2 vs edited =====

diff --git a/tools/ioemu/gui/Makefile b/tools/ioemu/gui/Makefile
index 52ce67bd20804b66f3fb6c580a83c0d562acf84e..e6ddc74e0677b9a23a60222a74eaaa6562d88363 100644 (file)
--- a/tools/ioemu/gui/Makefile
+++ b/tools/ioemu/gui/Makefile
@@ -1,6 +1,6 @@
 TOPDIR= ..
 CXXFLAGS=-I. -I../include -I..
-OBJS= gui.o keymap.o siminterface.o textconfig.o x.o
+OBJS= gui.o keymap.o siminterface.o textconfig.o x.o rfb.o term.o
 
 all: libgui.a
 

diff --git a/tools/ioemu/include/config.h b/tools/ioemu/include/config.h
index e48f2d97e5c2e3d718116bcc5b54807d2d147fc6..53a72b282fb6faf8d770d4cf00321acc466f42eb 100644 (file)
--- a/tools/ioemu/include/config.h
+++ b/tools/ioemu/include/config.h
@@ -388,8 +388,8 @@
 #define BX_WITH_MACOS 0
 #define BX_WITH_CARBON 0
 #define BX_WITH_NOGUI 0
-#define BX_WITH_TERM 0
-#define BX_WITH_RFB 0
+#define BX_WITH_TERM 1
+#define BX_WITH_RFB 1
 #define BX_WITH_AMIGAOS 0
 #define BX_WITH_SDL 0
 #define BX_WITH_SVGA 0

diff --git a/tools/ioemu/iodev/Makefile b/tools/ioemu/iodev/Makefile
index 3a436619183021552d1c228bc3a23ee228779321..964f61485dc554375a68995785d8a41c7ce47bae 100644 (file)
--- a/tools/ioemu/iodev/Makefile
+++ b/tools/ioemu/iodev/Makefile
@@ -2,7 +2,7 @@ TOPDIR= ..
 CXXFLAGS=-I. -I../include -I..
 OBJS=$(patsubst %.cc,%.o,$(wildcard *.cc))
 BXLIBS = ../gui/libgui.a ../memory/libmemory.a  
-LDLIBS= $(BXLIBS) -L/usr/X11R6/lib -lX11 -lXpm -lstdc++ -L ../../../tools/libxc -L ../../../tools/libxutil -lxc -lxutil
+LDLIBS= $(BXLIBS) -L/usr/X11R6/lib -lX11 -lXpm -lstdc++ -L ../../../tools/libxc -L ../../../tools/libxutil -lxc -lxutil -lpthread -lncurses
 
 all: device-model
 

diff --git a/tools/ioemu/iodev/main.cc b/tools/ioemu/iodev/main.cc
index c784adb555cb168e332da1340e1e19572cb466af..e82f47d2f4c7c02555641167142fe64ca7bcf009 100644 (file)
--- a/tools/ioemu/iodev/main.cc
+++ b/tools/ioemu/iodev/main.cc
@@ -1964,6 +1964,10 @@ bx_bool load_and_init_display_lib () {
   if (!strcmp (gui_name, "x")) 
     PLUG_load_plugin (x, PLUGTYPE_OPTIONAL);
 #endif
+#if BX_WITH_TERM
+  if (!strcmp (gui_name, "term"))
+    PLUG_load_plugin (term, PLUGTYPE_OPTIONAL);
+#endif
 
 #if BX_GUI_SIGHANDLER
   // set the flag for guis requiring a GUI sighandler.